Merge branch 'upstream'
authorStefano Zacchiroli <zack@debian.org>
Wed, 11 Apr 2007 09:23:08 +0000 (09:23 +0000)
committerStefano Zacchiroli <zack@debian.org>
Wed, 11 Apr 2007 09:23:08 +0000 (09:23 +0000)

Trivial merge